Merge git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <[email protected]>
Wed, 13 Apr 2016 12:27:49 +0000 (08:27 -0400)
committerTom Rini <[email protected]>
Wed, 13 Apr 2016 12:27:49 +0000 (08:27 -0400)

Trivial merge